*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1a42c5208554a8d167ec59d91de2d64c50d0fc9c..b5fc56255c76ad740088112d3829227dde9fcbea 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2006-07-02  Daniel Pfeiffer  <occitan@esperanto.org>
+
+       * progmodes/make-mode.el (makefile-macroassign-regex): Accept
+       preceding keyword.
+       (makefile-gmake-statements): Reorganize, now that makepp has
+       "override" and also handle forgotten "override define".
+       (makefile-makepp-statements): Add new "global", "override export"
+       and "override global".
+
 2006-06-30  Juanma Barranquero  <lekktu@gmail.com>
 
        * progmodes/ada-mode.el (ada-which-compiler, ada-mode-menu)